From 971ec7119cc466e36bdc389f9802f509a0dbd16e Mon Sep 17 00:00:00 2001 From: "kfraser@localhost.localdomain" Date: Wed, 5 Jul 2006 17:37:08 +0100 Subject: [PATCH] [XEN] getpagframeinfo field name mfn -> gmfn. Signed-off-by: Keir Fraser --- tools/libxc/xc_private.c | 2 +- xen/arch/ia64/xen/dom0_ops.c | 2 +- xen/arch/x86/dom0_ops.c | 2 +- xen/include/public/dom0_ops.h | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/libxc/xc_private.c b/tools/libxc/xc_private.c index 1fa2601887..16fef4e7d0 100644 --- a/tools/libxc/xc_private.c +++ b/tools/libxc/xc_private.c @@ -26,7 +26,7 @@ unsigned int get_pfn_type(int xc_handle, { DECLARE_DOM0_OP; op.cmd = DOM0_GETPAGEFRAMEINFO; - op.u.getpageframeinfo.mfn = mfn; + op.u.getpageframeinfo.gmfn = mfn; op.u.getpageframeinfo.domain = (domid_t)dom; if ( do_dom0_op(xc_handle, &op) < 0 ) { diff --git a/xen/arch/ia64/xen/dom0_ops.c b/xen/arch/ia64/xen/dom0_ops.c index 1a828b0e65..8c0360b15e 100644 --- a/xen/arch/ia64/xen/dom0_ops.c +++ b/xen/arch/ia64/xen/dom0_ops.c @@ -32,7 +32,7 @@ long arch_do_dom0_op(dom0_op_t *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op) case DOM0_GETPAGEFRAMEINFO: { struct page_info *page; - unsigned long mfn = op->u.getpageframeinfo.mfn; + unsigned long mfn = op->u.getpageframeinfo.gmfn; domid_t dom = op->u.getpageframeinfo.domain; struct domain *d; diff --git a/xen/arch/x86/dom0_ops.c b/xen/arch/x86/dom0_ops.c index 1a2f9aa303..500c7f7ae6 100644 --- a/xen/arch/x86/dom0_ops.c +++ b/xen/arch/x86/dom0_ops.c @@ -207,7 +207,7 @@ long arch_do_dom0_op(struct dom0_op *op, XEN_GUEST_HANDLE(dom0_op_t) u_dom0_op) case DOM0_GETPAGEFRAMEINFO: { struct page_info *page; - unsigned long mfn = op->u.getpageframeinfo.mfn; + unsigned long mfn = op->u.getpageframeinfo.gmfn; domid_t dom = op->u.getpageframeinfo.domain; struct domain *d; diff --git a/xen/include/public/dom0_ops.h b/xen/include/public/dom0_ops.h index a95814bacd..d6064d6074 100644 --- a/xen/include/public/dom0_ops.h +++ b/xen/include/public/dom0_ops.h @@ -162,7 +162,7 @@ DEFINE_XEN_GUEST_HANDLE(dom0_settime_t); struct dom0_getpageframeinfo { /* IN variables. */ - xen_pfn_t mfn; /* Machine page frame number to query. */ + xen_pfn_t gmfn; /* GMFN to query. */ domid_t domain; /* To which domain does the frame belong? */ /* OUT variables. */ /* Is the page PINNED to a type? */ @@ -177,9 +177,9 @@ DEFINE_XEN_GUEST_HANDLE(dom0_getpageframeinfo_t); #define DOM0_READCONSOLE 19 struct dom0_readconsole { /* IN variables. */ - uint32_t clear; /* Non-zero -> clear after reading. */ + uint32_t clear; /* Non-zero -> clear after reading. */ + XEN_GUEST_HANDLE(char) buffer; /* Buffer start */ /* IN/OUT variables. */ - XEN_GUEST_HANDLE(char) buffer; /* In: Buffer start; Out: Used buffer start */ uint32_t count; /* In: Buffer size; Out: Used buffer size */ }; typedef struct dom0_readconsole dom0_readconsole_t; -- 2.30.2